debian/gbp.conf: use DEP-14 branch names

diff --git a/debian/changelog b/debian/changelog
index 7e14b3b72b99308cd7d1d7cf525e63e0e3e417b3..d809b33621bd9591018c7db24d4ad52218abef92 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ostree (2016.3-2) UNRELEASED; urgency=medium
+
+  * debian/gbp.conf: use DEP-14 branch names
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 28 Mar 2016 12:02:59 +0100
+
 ostree (2016.3-1) experimental; urgency=medium
 
   * Prepare package for Debian (Closes: #813308)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index d0c1355fa49ce9116f47092f4dedb3ecb684a36d..11175b1b3f9799e1bc9375edd1511a265863f9fe 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,5 @@
 [DEFAULT]
 pristine-tar = True
 compression = xz
+debian-branch = debian/master
+upstream-branch = upstream/master